Code cleanup & design updates