Make changes on code, recomendations from Luke