Made code less verbose for initial design