Cleaned up code by getting rid of commented code and updating status logs