Cleaned up code, added combining transformations