Cleaned up code in forms init