simplifying code
Bug fixes