Cleaned up some of the redundant imports and code and fixed issue 134