Cleaning some files and makeing it more eficent! :D