Code style improvements and deleting redundant files