Best effort attempt #1

Best effort attempt in prettifying. Will resume, this is just first submission.