Code Refactoring/cleanup, make images static final