Fixes and beautification round #3