Did some formatting and removing of warnings