Clean up prinlns and white spaces