Some minor changes to comply with ruby conventions