clean up code a little, add extra prefixes