Removed unnecessary code
Added few doc-comments
Corrected RectangleShape drawing
Added few more doc-comments