Improved readbility

#1