Code was refactored #11