various style changes and general cleanup