Removed extra newline
Pulled special mappings into individual methods