Trying to comply with best practises from sensioLabs