refactored boilerplate
refactored capitalization
more quick checks