Cleaned up a bit; still needs work