Cleaned up things a might