Updating design a bit and cleaning up models