Cleaned for easy code reading