Made the system less complex and reduced the code size