Restructured Code. Removed some more unncessesary Lines.