Remove commented code & handle aspect ratio