Reformatting core module code
Web module clean-up