Cleaned up design a little bit