more "beautification"; hope last commit