Cleaned Alot and Restructured