Code cleanup

Added cleaner code formatting