MDL-46218 core_notes: moved checks for enable functionality and some coding style clean up