Cleaned up syntax
Added comments to database columns