minor style tweaks and empty class files