Cleaned up formatting, finished my objects