Formated code a bit, added officers