Improved style & readability