Trying to follow good code practices