Untangling mane
cleaning a bit more. Added comments
Merge pull request #1 from Swelly/master

Untangling the mane