Cleaned up format
Added comments