Cleaned up formatting and directories