Removed comments that were ment as a reminder for myself.
Added comments and code refactoring.