Code cleanup

turned a few function statements to function expressions. Changed 'opera' to just 'o', etc.