refactor: mini fixes Req-17
refactor: mini fixes Req-17

AMOSTeam3/amos-ss15-proj3,yadimon/amos-ss15-proj3,yadimon/amos-ss15-proj3,yadimon/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,uv48uson/amos-ss15-proj3,yadimon/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,uv48uson/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,uv48uson/amos-ss15-proj3,uv48uson/amos-ss15-proj3