Cleanup and some style changes