Remove white spaces and make code more clean