cleaned up code, added changing status message