Code cleanup, removing superfluous methods. Also started on short presentation.