Removed extra braces and removed assert() which will be taken care later