Cleaning up memory
Moving Bitmap code in cpp file (fixes #6)