Removed extra log line
Restructure API