minimal cleanup
general cleanup
minor cleanup