FIX issues raisded during code review