Cleanup : removed old, unnecessary methods and added more documentation