Added accuracy
Cleaned code