Made some minor modifications, nothing that should affect funcionality