Minor formating and IDE changes/mappings