PRINCE: Code clean-up