Formated the code and added elements