Cleaned up code for fiefs