Fixed issues based on review