Cleaned up some interface things