Added abstractions, cleaned up the code a bit.