improved readability and variable naming, added travis ci