Updated Design, Cleaned Code