refactoring code, add lab report