Formatting and whitespaces
Remove dead code
Work in progress on a my prototype solution