Cleanup and a small optimalization