[refactor] somme more clean ups. mainly removing double empty lines