Fixed feedback link, cleaned up code