Design updates, code cleanup