Updated for coding standards and made room for assign 2