Improved readability
Initial import.