Cleanup

Good stuff, thanks Sergei!!