Fix case sensetive bug part #1
Fix case sensetive bug part #2
Small clean-up