tweaked astyle and formatted codebase