UPDATE: Code cleanup