Beautification/Enhancement Comm.

File Uploaded