Removed world-readable access level + Refactoring