Updated: Code cleaning