Cleaned up basic analysis