Reopened: Cleaned up method