Setup fen code cleanups