Cleaned up code and finished report