Working on cleaning up conventions in foreground