Improving my Application