make constructors private since these classes aren't meant for creating instances
minor fixes