Minor cleanups, implementation

- Not needed classes/methods deleted
- whitelines deleted
- some simple methods implemented