Cleaning up code and fixing height in heading