removed the bloat and crap. autoformatted using eclipse