astyle and cleanups
ready to test