Cleaned up code for HTTP Basic engine. IN-6