Updated to cleaner styling