Changed abstract markers and cleaned up some of the variable declarations