Cleaned up some parts of code and report