Cleaned some code and made staruppage