Cleaned up code
Merge in changes from hach-que.