Moved strings to constants in many places; some general cleanup