Formatting Fix + Better Class Names