Started to do some cleanup