Updated Interface and cleaned up the code a little bit