Cleaned some functionality.