Cleaned program a bit