Fixes, beautifully code, remove unnessesry files and codes