Cleaned Luis' code from previous commit