Just a little general cleanup