Refactor Bitmap wrapper
Javadoc and method renaming