Clean up, no 80+ char lines, command to run put togheter in more readable code