Cleaned code, removed logs