cleaned up code and fixed a bug