Cleaned up webapi prototype