#52, Final code for code reviewing