Updated page and cleaned up code