Clean Code, change old names and update documenation