Removed unused attributes and moved some related functions together
Merge pull request #3 from noonat/cleanup

Removed unused attributes and moved some related functions together

I Approve this message.