Cleaned up code, changed version