Cleaned code, merged to WebContent.