Code is cleaned up now