Code cleanup on isle 4!