ISPN-2689 Removing duplicate resources
ISPN-2689 Apply feedback on style and improve javadocs