general cleanup, lint testing