Fixed all Moollaza's suggestions