Cleaned up some design issues