added extra empty lines to improve readability + remove useless spaces