Removed biggest code smell