Made the code adhere to code convention styles