Cleaning
Used eastwood to check code and fixed some stuff