Made design changes and implemented code review suggestions