Cleaned up some code in knight