STYLE: code cleaning and removing white spaces