cleanup + astyle