Updated some design items, cleaned up code a bit