Add comments
Move to correct directory
Remove unused method