Fixed repative code and did some code cleanup