Cleaned white lines and some unused code