Better formatting

Added some cases for code formatting