Massive housecleaning: make it look like actual ruby code