shortened code
final commit before exercises