Rebuild of code

Updated readability of the code.