Cleaned up stuffs