Aesthetics Issues / Code Cleaning