Cleaned up code readability