Just some minor cleanup and arrangements